Changed Quantum to Neutron per LP1286145

Change-Id: Ic332dd3370b005659933a2276176494a40f53310