Merge \\"Add values to ApplicationInfoFlags\\" into nyc-mr1-dev am: 6ac6ceb28b
am: 296b9edfb5

Change-Id: Icb86b109bb55500ad8f0f0768a5e8e8b04147bab