Merge changes Id6d23112,I474dd0c0
am: 6420708d76

Change-Id: Ie6fc36d1f2d947451c4e249267351415e1dbba88