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

* commit '1f2f669f61e610e47df29aee9261c48339ff8f15':

Change-Id: I55c2ebb27d28b156e06112cf54a750cb771b4445