Merge d83a851b136575e235a5727aedfec7d5f2a86ce3 on remote branch

Change-Id: Idfe6ba97a2a6b715baf667224b840985ee75061b