Merge 7af3e19c45f920152078325150dd43389c7294a0 on remote branch

Change-Id: I45b7cf7021f9732c654a9d56f51c5f89bc3d329d