Merge e4dfbe360ae04db7f5a1724d60e04b68c089af31 on remote branch

Change-Id: Ic93b80a081e499594d90b6b01d5b771a99d99fec