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

Change-Id: I5cf0cabc7c7abbce7a9c1181f40706966cafebfb