Merge fef611529a3685652002d63e7e760644768f4501 on remote branch

Change-Id: I56b0bccf17e61363061f9d90697d762496374e69