[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 skip reason: Change-Id I2b02d01dfd821ebcbf098236e11cf1d2832677bb with SHA-1 caf2d223 is in history
Change-Id: I935e684b3906924ab606e632c7de0629a0954b84