Merge "mAid can't be set to null for default selected application (C000)." am: a3c792bb am: e6ca1532 am: 807bafd0 Change-Id: Id4d8bab1d917184b98ddea8a567f9014280351c8