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

Change-Id: Ic2d26563ce1a3fdb0873a61714d1440ab537f546