Merge 670df8bfeca517555fd6edaf52aa519406a97356 on remote branch

Change-Id: Ie41a69673787330f56a7dffa1aeabf4fa57eee61