Merge "Add extra flag to ApplicationInfoFlags" into oc-dev