Merge "upperLayerIndicator_r15 is optional, nr state design changed" into...
Merge "upperLayerIndicator_r15 is optional, nr state design changed" into rvc-dev am: 5eec2486 am: 8bd3ae93 am: a549401a am: 3b40ea86
Change-Id: I9c524133c75d454863593bf96b4344f2efaf5a42