[automerger skipped] Merge "Change reference to Bundle.filterValues" am: 598b5d5340 am: 16e27b9a3e am: 43079efe9f -s ours
am skip reason: Change-Id I5cbc7f771f8443835da7acc9e4330ca238d0f929 with SHA-1 f68705a057 is in history

Change-Id: Ie7766e46101a37b6175688ace32063e460b89ae9