Merge "Remove -night qualified resources" into nyc-dev
am: 83ca62b

* commit '83ca62bdbe00359a1cf574efc5abfb19c5f57337':
  Remove -night qualified resources

Change-Id: Ie61dafd3462a85bec90496a0ee4aa3e06d96c8e4