Merge 2a5a8ae8c5d788e89f6142f37e3e4422eb080e03 on remote branch

Change-Id: I32e21aa9b1ed5294cae1ec9c6d038815b64671f9