Merge 71336c91ff1e47563a7e8a79ca8d47fa6f713a44 on remote branch

Change-Id: I9afba044679b2a270cce9f7a2f84c05259bedd17