Merge changes from topic 'n-versioncode' into nyc-dev
am: 99ec81ab46

Change-Id: I9b658d156929e6d958bc517d4fc38c8cd987eb2f