Merge c65f2512035f1851f82c0dae86fd4f14619bbf4b on remote branch

Change-Id: I78ddeca5566db0319e35ae89c47e52db94a38648