Merge 7cee5b002f6d504ced5885f9ebf28f92c970034c on remote branch

Change-Id: I4a383708043abe374c58068974b9d81106935b51