Quantum to Neutron rename

Change-Id: If0668e45ff345a1e5a52d5390e83c41574bf00e5
Merge "Quantum to Neutron rename"