fix some missing change from quantum to neutron

Change-Id: Iadad11f364e8200f8e4a92b191e834bdf0220179
bp: remove-use-of-quantum
Merge "fix some missing change from quantum to neutron"