Merge f7e134c7875209ca066719876fa177270f71905c on remote branch

Change-Id: I6b24fbcee1ca2316812dce2422f976b654853692