Test: Simulated and verified the new intend is used Bug: 118658558 Bug: 115990430 Merged-in: I07a58d0fe1c34106b3da85d1dfd4576b40da4bd5 Change-Id: I07a58d0fe1c34106b3da85d1dfd4576b40da4bd5 (cherry picked from commit 349b9ba16f1891a21091804f51060c6a867a5bcd)