am cd6f00c3: Merge "Implement back-tracking when searching for attributes in XML or resource bag" into lmp-mr1-dev

* commit 'cd6f00c3a05717862a88b7409d11176ae53fd9a9':
  Implement back-tracking when searching for attributes in XML or resource bag