Merge "Add values to ApplicationInfoFlags" into nyc-mr1-dev