am 3154c127: am a21e9537: Merge "Potential fix for out-of-date hardware layers" into ics-mr1

* commit '3154c127bdd547621ad2831992a7cb8d9a7cdbd9':
  Potential fix for out-of-date hardware layers