Merge 1a06ef097dee25349ae15a3c3700f909b82e9d02 on remote branch

Change-Id: Iaa02e69e6ecbdf05fec9001c3f1caec4a4c16d6e