Merge ca79876dbffcb8294bb07ba9fcdc51d6c1010203 on remote branch

Change-Id: I7266c8d50607f3641ebe5f229a99235593f34775