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

* commit '11125b07000f7d4bec38dedf8ea4cbac725224e0':
  Remove -night qualified resources

Change-Id: I570494b71b9734f3131166290d14292105a10cf7