Merge 97cf671d934e6562435586ecf3fa40ee9f28ea78 on remote branch

Change-Id: I2ae8b50bf4cc851fca3ca7341c4ed691e5c37661