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