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

Change-Id: I3aa2488496d7f21440c2bef03944b0f2bdaaa0b3