Merge "upperLayerIndicator_r15 is optional, nr state design changed"