Merge "Check key before edit value in countFlushCompleteEventsLocked" into oc-dr1-dev am: 8669acc9 am: f0eff80a Change-Id: If794f597345d2949fa4194e36cae47a522888ea0