Merge "Improve BaseBundle#kindofEquals" am: 42ab50d14b

Change-Id: Ic5c2c5bcf979236c77344d0507d071bbb83f624e