Merge 7e4b8b5b4b694a764a216de1b4c7c952c17257ce on remote branch

Change-Id: I6d2ce7b3174f193685af70a18adec79effe49bb8