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