Merge "Merge "Add build number to apps\' version name for non-platform build" into nyc-dev am: 1059f37377 am: eaa4ef4cfc" into nyc-mr1-dev-plus-aosp