Merge "Fixes out of bounds error in ActivityMetricsLogger." into rvc-dev am:...
Merge "Fixes out of bounds error in ActivityMetricsLogger." into rvc-dev am: 2b75d73b am: 660864db am: d7ff864d am: 7b041034
Change-Id: I31f52610cd60e05754fdfddca23e4c9866805fb7