Merge changes I369333c1,I55e7b6da
am: 19dfeb0e72

Change-Id: I24b535480dc070ff8ddd7aefedd342e23d3d5588