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

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

Change-Id: I734b6bea4f4f9136c1e23b18c651f9b7d4dd57ee