[automerger skipped] Merge "Improve BaseBundle#kindofEquals" am: 42ab50d14b am: 1f82fbb4ac am: 893bf3b7f5 -s ours
am skip reason: Change-Id I04c28cdd1293227d9887b0c17e178f61328c1959 with SHA-1 0e8c9c4daa is in history

Change-Id: I38fb654c39b463e1a0e81c4158d16f27fb89a6b3