Merge "Add a GetMappedPackageLength to Updater" am: 5135d1f095 am: 254e5c940b
am: 2040283730

Change-Id: Id1e061da1299c46814ff125efef3bda613f7f748