Merge d18e00e79221ef7a0d7fd6b55c2607ef8fde3819 on remote branch

Change-Id: I61774f6acfd9499989aaac7cd9033504a8991d94