Merge 105861cb3defb8c64b8cf18ce34fe9526b20331e on remote branch

Change-Id: Ie1c508330be08641120f35afb23a2dd2a1c000b1