Merge 8daf7e5979412740a5272f3b12cb0f9373185735 on remote branch

Change-Id: I16042826ddb95218f277aa6af1044f5a3b98db55