Merge d67207f93536ef76ab0d79464f921a2bbe92f22a on remote branch

Change-Id: Ic03002cf67cb174c963557a16f73bca0fdebd0c6