Merge 64bc373de7a71763f84cee0e546a904eb673eeca on remote branch

Change-Id: If80777ddbc81155f453e6c0db3fdf7f6147140fb