Merge 36bc90b9bf0446e5d4d5f830ca1e2dee52769558 on remote branch

Change-Id: Ibf42d8ca2fbc28501cc6ef45fc8a8c272253dedd