Merge 97cf671d934e6562435586ecf3fa40ee9f28ea78 on remote branch

Change-Id: Ic0df65f55f5f4ccb687da0c5b588ef3781c2f174