Merge 7497ffc543ea20c88b9e216e049c40c93f25b6d9 on remote branch

Change-Id: Ie9a859fcad652830896207f98daafb705ab611c4