Merge "Store the appropriate layout id for the infrated view, so that it can be used for verification during reapply." into nyc-mr1-dev am: d2d8e9b228
am: fcdbde4caa

* commit 'fcdbde4caa547087d82830647517c411e216626f':
  Store the appropriate layout id for the infrated view, so that it can be used for verification during reapply.

Change-Id: Ia4cd711147fa865a18177f98b792181d71c71acd