Merge 3e8b68009fa3bd0eea3f4d0b917e6a6d40ece075 on remote branch

Change-Id: Ia9f31bcfdf1e71f5a7bd53eba408c4887423f4fa