Merge "Change reference to Bundle.filterValues"
am: 598b5d5340

Change-Id: I0b2cc753addf4f806f11f0f801d6f796340142ef