[automerger skipped] Merge "upperLayerIndicator_r15 is optional, nr state...
[automerger skipped] Merge "upperLayerIndicator_r15 is optional, nr state design changed" am: c041126b am: 91d9579e -s ours am: 185b0501 -s ours
am skip reason: Change-Id I2b02d01dfd821ebcbf098236e11cf1d2832677bb with SHA-1 caf2d223 is in history
Change-Id: I90d3d88c23461c2c1e6484f5570f22f524c93f9a