Merge 079bbdaaf0e0fa882b36dc26982a6b555dc8469c on remote branch

Change-Id: I05de860a0edd33e38b7b61c653d095386d58a562