Merge 472fc1e6bf51fc4fb21c1e55edea4554eae4e38a on remote branch

Change-Id: Id306f1341888d6deac50f4b78fb2e952097a942a