Merge "Don't update publisher version code without scanning manifest" into nyc-mr1-dev
am: 845096ffa3

Change-Id: I94333e394d1dd326461883e27eec2e132707a16c