d535f9b7bb
No functional change, just rearranging code. Change-Id: I28328dfefd7de269d326834c484f2c2fca4e6c1f Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>