Merge a98f249fab34d1997d74005769308c0b82af4516 on remote branch

Change-Id: I6a77fcc93360e31530d8eea428f41e19b435b6e3