am bbb5f5ac: (-s ours) am 55605c9e: Merge "Support POLICY_FLAG_ALT et. al.  (DO NOT MERGE)" into honeycomb-mr1

* commit 'bbb5f5ac36bdac7ba05b1a563fb9e9f903cc6f5a':
  Support POLICY_FLAG_ALT et. al.  (DO NOT MERGE)