Merge changes I34842acd,Icc6c4d6b
am: fb3dccd961

Change-Id: I38f5452905216ebf9e0b28311d34ad0667243274