Inline this code into the places that called it. These two spots will be combined into a single path in a later patch. Change-Id: Ice2f009ad56b783dc28ebbf1abbb877ce6000293 Signed-off-by: Ben Walker <benjamin.walker@intel.com>