Merge eedadb467dbc7295136944c9f8ca0acc8239359d on remote branch

Change-Id: I4cb7702b10cb171e8c9254873e348cdac9eb6a28