Merge 134af4f134d1980f77216440b993418390014f1c on remote branch

Change-Id: I62055297af65e1b8c7cf54d5b7b46aa5ef185e08