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

Change-Id: I57d4319c30cd92b0df4d72f112b8f36c50eac1fa