Merge 53d8c57ee5afcf550df4e1c150309121ff77273d on remote branch

Change-Id: I03bcdbdea25c7f8d12999008f15a7259cd71c4ee