Merge 11af2db29542eacac90b484b32c90801e5f84aec on remote branch

Change-Id: Ie74a0739756c8bcef3e8d2146a8060f4918dd6a7