Merge changes from topic "b116618418" am: 002fa789e6 am: 0e71219f40
am: df9986e867

Change-Id: I7d8bdbf5e09d9cb83829bef053aded28827c1f42