Merge 08094cfa54710132aa631ae4cf4c0477efef5a18 on remote branch

Change-Id: I0c2b303e03f3f9ece08b01dc46ccd1a9877f6e26