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