Merge to upstream r324282. am: 545e0e29a1 am: c4044532f5
am: 8f77f04263

Change-Id: Icf1dfb5f4ee732fcf2088947cb032863654f94d4