Merge a25f334fd8bae17987a378a52d30f9ccd45d948d on remote branch

Change-Id: Ic64a952668bccf6ff8fbc6f2ca388753ff727e22