Merge "upperLayerIndicator_r15 is optional, nr state design changed" into...
Merge "upperLayerIndicator_r15 is optional, nr state design changed" into rvc-dev am: 6e6e2330 am: fbb59c06 am: fb65e142
Change-Id: I3d212a34307937988a49eaa151cb1c78dc79c83b