am 740acf21: am c7801877: Merge "Fix issue where non-resource attributes would...
am 740acf21: am c7801877: Merge "Fix issue where non-resource attributes would cause obtainStyleAttributes to fail" into lmp-mr1-dev
* commit '740acf21':
Fix issue where non-resource attributes would cause obtainStyleAttributes to fail