Merge 1eedb609159bdcc5af125281020db393e7da7151 on remote branch

Change-Id: If27d2c059bb056e1100777a10fd4bac4b85b3c53