Implements Blueprint: remove-use-of-quantum Change-Id: Idebe92d56d277435ffd23f292984f9b8b8fdb2df
Change-Id: I846eec12e800c15a545946604fe77a0a6b83fb46