Merge changes I3013c28d,Ic60970bc
am: e9db5c2120

Change-Id: I56f9706d89d967feefc3e381823e9cb19fe4289b