Merge changes I7a3c181a,I72c60ec8
am: 6aa1b01316

Change-Id: I21842081a897ebb26f9c55605dd9fa934fd83fed