Merge "Add protection for the BadParcelableException" into udc-dev