Merge 3a4256a3b27d2c01217945b66d96b695207f335d on remote branch

Change-Id: Ie5bcd65fc827fd37f7313f797fb98a2a190185d2