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