Merge cdc18cb9e4dccdf1746f9756fb473fba3b5287cb on remote branch

Change-Id: Ie71af460ca7b2780fa37d7a7fcf6105ac6fdcfe1