Merge "Set adminExtras as an empty persistable bundle if left null in builder." into tm-dev