Merge changes I6c3a84f5,I05414f3b
am: 54f07b502f

Change-Id: I7cc8b55709ab1f24b8dc4ead5ccde45927788eca