Merge 4275d90f50b1857f2b45cb4bbc20fbe0b3c54bc7 on remote branch

Change-Id: Id957f24fb7a96ed36d2ea87c8774600dfabcfe06