Merge "[BugFix][Batterystats] bugfix for noteResetVideoLocked" am: 5c3704583f

Change-Id: I3e3d6680bbd0e7c9961c08704412372db2e7868b