Merge "Do not allow adding custom Parcelable in Bundles" into qt-dev
am: 1348399885

Change-Id: I79e6a5f44af9990b24a7ac2415428b6ddf34f14c