Merge 72a78d04fa8899c1e21988346c85f0ed5c574b91 on remote branch

Change-Id: I7fd8a1801858dd4ba0e7422ee9b8ac7923a07b7a