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

Change-Id: I1b8a13db04d66dffa55a39a9303f5b9e23d60497