Merge "Add extra flag to ApplicationInfoFlags" into oc-dev
am: 01d69aae3a

Change-Id: I6ff9abe0cafd62e5160483fca547f33822bde731