Merge aedc89921eb93fb719a238f62112f8ab3111c432 on remote branch

Change-Id: Ibdb0dbbf77acb181e8f777927f93b04c693a23ed