Merge "Remove unnecessary override of Parcelable.getStability()" into udc-dev