Merge 81d836b09d7a57e54c4acb68fc90226a80afe313 on remote branch

Change-Id: I4ccec68c65f8164798f58bc0ab8a78f25f144caf