Merge "Fixes out of bounds error in ActivityMetricsLogger." into rvc-dev am: 2b75d73b am: 1858fd8d am: 17936d46 Change-Id: I017f8ec7456378b32303a2b440582f369a81a91a