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

Change-Id: I585639d10d39b3e6aecf3f230a307f337f54a93d