Merge "Configure the package name of the updater app" am: ed3e6d47ff am: e293f7ee0d am: fa04abb74e
am: 84fa8cb999

Change-Id: I1dc9af416b2b9faa2e4c36c474627c1e168e95ec