Merge d37c13476275357ecd6cbdf37af45293821f2ff6 on remote branch

Change-Id: Ibf9fabfafc8eda515f79e3b9967a1961e494163a