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

Change-Id: I1ba8c5bc910bb4727ed59b8e758c7e94006e98df