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

Change-Id: Ifa2ccd079ae5998fa0be9337954aff5348a74150