Merge 7fce3f6561b035281142b8299eee910302d2323a on remote branch

Change-Id: I76ec587a608cb0c7c4ef3a41235801e0e0732c11