Merge commit '10252ea95b0dfb0b6daefb0a5ee6afbb0b70b939' into b77882292

Change-Id: I9dbc46e311b2e05c713cbc0f597a09912dbb4d18