Merge 475bbc7207a52028bb464093c90bb04aab2f522c on remote branch

Change-Id: If5adb67e5c13002ab31db629076267583816a8c2