Merge 7c8a8785759ff85871e821c350966688952cad81 on remote branch

Change-Id: I1e28b83674a78ab191a56bb34eb4623bc3df7a86