Merge 1940e8b6ad1c3ccfee891b6d162b7663409385d6 on remote branch

Change-Id: Ieb36c0b093e6512638816f525d7033d83d4937cb