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

Change-Id: I8239ffae3bfd5b8414482c5e486f62af5b1bdf31