Merge 8d7ac7ecf0de3bc5fdb5e9744995e75a59215a14 on remote branch

Change-Id: I6d3e4d609372afd0f2971bb39af3d10d9589f777