Merge 7bb48ca62356d41ee36ef8d02f354f48d5d40a70 on remote branch

Change-Id: Id9606e1ae1d0b9d7375478e04eb041c1bd1d3ea3