Merge 5157c329bdd1477c11e38189cbc79bae1b3473f4 on remote branch

Change-Id: Ib9bb87e95530b169690d95596ed0d84cce7cd215