Merge a3a020beb51fa5b365abbf2ede2fb66735f682a2 on remote branch

Change-Id: Ifa3089e9678ea66d1fcbab8058dfca116b19abe0