Merge "Merge "Fix issue where max idle time > total idle time" into nyc-dev am: 89046edb4d am: 7e762beb7f" into nyc-mr1-dev-plus-aosp
am: 31f191099f
* commit '31f191099f3e88a414b9d288a544fb20f3139e87':
Change-Id: Ib82202576756b1aeb8a5c89c0bd4eb217b57fadf
This commit is contained in: