Merge 3a24a6165e03c9a79ded1434ddf10c12b0da487f on remote branch

Change-Id: I1dd8076b0f5cb23aa67df96b8421ba7e22368df8