Policy updates to bring inline with AOSP