Merge 0534f8b52fbfee5fa38f7bb7fce296b006dc9a68 on remote branch

Change-Id: I82095673bb4cd803c3c5387a1a2fb6b5910744d9