Merge e66b66d303cd94b58691813cfbf8d3f90afad4a5 on remote branch

Change-Id: I0512b8a9fe1c00d3494c61da203fbaf575eb95d3