Merge 39ff74035adc9fe28715e7000e7fe48e8e2b5fe4 on remote branch

Change-Id: Ie6132b14675be591fe288d74664440611d1024ac