Merge "Merge "Remove -night qualified resources" into nyc-dev am: 83ca62b am: 11125b07" into nyc-mr1-dev-plus-aosp