Merge 72a78d04fa8899c1e21988346c85f0ed5c574b91 on remote branch

Change-Id: Ifa4783cf8cc56d863fd9f9ae4927daecab46108a