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

Change-Id: Iff36c79b9e4f72510f8b3f9434648a9649bf95c9