Merge 47eb69430cbedc7e883529c6bcbb61b2b9d8e050 on remote branch

Change-Id: I8f8dd9a96a75d5ae98a33ab8890e44141024cba4