Merge 04000b682f7c4b9ea14d791dd144af763ef6977d on remote branch

Change-Id: I23cf424a4d2ab4a84fb4c86a5f4a61df8305ffe1