Merge "Merge "Reduce parcel size to avoid binder transaction failure am: 22c1f9ac9f am: e59e7dd244" into qt-r1-dev-plus-aosp am: 8d36e42fa5"