Cherrypick Fix bug 1359455 from R1.10.

Change-Id: I15fab506cfa2c7f39b3127ecb5ec68d2bb3770ce
Merge "Cherrypick Fix bug 1359455 from R1.10."