Commit on behalf of pedro

Change-Id: I18cd094c40087f0a888e7d9d09e34b0656d17cef
(cherry picked from commit 915c5b373d8f8751522656146054e8012457d634)
Merge "Commit on behalf of pedro" into R1.10