Merge "Work on issue #26879170: Adjust doze maintenance windows..." into nyc-dev am: 7a6dc6c
am: e838673

* commit 'e8386731abf2cd3da23f9ac2b5d4412875d3a2be':
  Work on issue #26879170: Adjust doze maintenance windows...

Change-Id: Ibc69fce7abbfdd99813d6dcddf2b0dfbbc0959f9