am 2c6afef8: am 1da3d656: Merge "Undeprecate LayoutAlgorithm" into ics-mr1

* commit '2c6afef8766371bf933f8675c80687802ce045e0':
  Undeprecate LayoutAlgorithm