am de4f8c38: Merge "Traverse layers in update order" into jb-mr2-dev

* commit 'de4f8c3872c6284605c168687c69ebfa72ea49d2':
  Traverse layers in update order