Merge e3e39bc1cd0d319b2af452b3fbfcd6fe91f6a551 on remote branch

Change-Id: If0a274b3d2b54318324fc08c634a61aabe1f7772