Merge aff7347eac30b6b5788aaa1117956da58da1101d on remote branch

Change-Id: Ife9a129510cc69f17aaf60e6b1c5494e1a089949