am 0c82c484: merge in master-release history after reset to 244e25ef817ddf48727845f14d08b2b787e1ff89 am: 44efeb3486

Original change: undetermined

Change-Id: I485e7284357e6c9fc0c2f5df68dbb0d9ec2b854f