Merge be475438c8d003b537d55308d2690f747ec3eeec on remote branch

Change-Id: Ic25b0752930508775d1a738812df6c5b7377b401