Merge "Fixing issue in current and max duration calculations." into nyc-mr2-dev am: 1decad5e8c
am: 05cf63f3d7

Change-Id: I2db03bfba8bcab2a2ae52f38582aae3151d99840