am 0c82c484: merge in master-release history after reset to 244e25ef817ddf48727845f14d08b2b787e1ff89 am: 72027d9ad7

Original change: undetermined

Change-Id: I207d0ce3bbe2e0726ee023a4709e408450e3162b