Merge "upperLayerIndicator_r15 is optional, nr state design changed" am: 0737c31dac

Change-Id: Idee0e26ec0fe070e358698ccf7ebe4fa9e44c02d