Double commit to fix 1358128 in mainline.
Original commit in R1.10 is d9eea8bd0dabf241b490985616ff36a9d6aa826f

Change-Id: Ia0e46d1898d5cd3213e0022fd2d35846f7a6fe4b
Merge "Double commit to fix 1358128 in mainline. Original commit in R1.10 is d9eea8bd0dabf241b490985616ff36a9d6aa826f"