Merge b44f855298df121ec61699836da33065a124a3a0 on remote branch

Change-Id: I650fa8fc8e003524657457a56f548b75185b9728