Merge 79b8d5543b4ea03b21c50aeb9bfabff2cebfefed on remote branch

Change-Id: I5bfde230b16c392ac9579ac90dead7efe6602d40