Merge eaa43bb2192ce407a6cdc6983598e7641c7eab12 on remote branch

Change-Id: I504cf56ea0ec45b926aa752994cc7a2acf082462