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

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