Merge changes from topic "binder-primitive-array" am: d88ac7f787
am: 3466efff36

Change-Id: I9464ba0ca9c0702ad1edb8f8d362746834dcf825