Merge changes from topic "more-binder-arrays" am: 16718009cd
am: 1551a04a1f

Change-Id: I8dc89f7d290064577ca7f6710fd14a9894092f6b