Merge 17afeae1b4f9225f78d74eb268ee2c10f41c0c9b on remote branch

Change-Id: Iafd52378b8eb968c613b56c9f9805e479cb754dd