Merge "Merge "Fix issue where max idle time > total idle time" into nyc-dev...
Merge "Merge "Fix issue where max idle time > total idle time" into nyc-dev am: 89046edb am: 7e762beb" into nyc-mr1-dev-plus-aosp
am: 31f19109
* commit '31f19109':
Change-Id: Ib82202576756b1aeb8a5c89c0bd4eb217b57fadf