Merge changes Id2a61d35,Ibe802c36
am: 3cf9f9b838

Change-Id: I56c5e5df0c716d72163aca5a50775ae92228c630