Merge a2a96d47281bb319324c310ba87a6ae5ca052d04 on remote branch

Change-Id: I3944aea6b60536f14242907c72028507e8efded5