Merge "Remove -night qualified resources" into nyc-dev am: 3602edf
am: c42a680
* commit 'c42a6808e8d5a06935f1a38045431ab99bf495a4':
Change-Id: I9b20eb73828fbf5584dcfef07b5c43aab9b1a067
This commit is contained in: