Merge 3da862889662abc8da43af8aa2a11daeb59b9891 on remote branch

Change-Id: Iff0b62fe961423e43c15859bfea54fa0ca51a2d1