Merge "Dereference cached Bitmaps in EventLogger" am: 456238e59e am: 752b1baba0 am: 6239d3b368  -s ours
am: 92fd1fbe65  -s ours

Change-Id: I92381919ca26864827970d5641e35843548e0fb2