[automerger skipped] Modify several 1.2 nn operation specs. am: 3ee1f4a333 am: afe2661cc7
am: af9e17465b -s ours
am skip reason: change_id If8b8cabd249f17247d8a5278b8360685c97c68e6 with SHA1 b9319bd3bf is in history

Change-Id: Ibedd716ac9a4cc19212c2810653155d9c2e33a58