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

* commit '233f67302e7d35242613c5d4502459b085868595':
  Traverse layers in update order