Support POLICY_FLAG_ALT et. al.  (DO NOT MERGE)

Change-Id: Ida3b8300764623662052f80095973186cb9d4616
2 files changed