am 3c68bdb2: am d024f984: Cleaning up some reordering issues:

* commit '3c68bdb26643eacbb411759799f6fcfb934c34eb':
  Cleaning up some reordering issues: