Merge 64df2d11762aef48ef6cb62fb244937bee6fd1d5 on remote branch

Change-Id: Icfa8e025c44819374e8ad5b2845d45a35cd14396