Merge 4452f8646e373c21a9dda2066d85342abe3fa413 on remote branch

Change-Id: I802002384adc4041970f80fa7fa1b6cdc85fbe56