Merge c68f7b4ee214e27e3de9105f4765846030092622 on remote branch

Change-Id: I5ef978dc70c3289ab78b4f14920b55ebbc70f124