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

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