Merge "Support POLICY_FLAG_ALT et. al.  (DO NOT MERGE)" into honeycomb-mr1