Merge "Pass more information to the attribute parsing functions." am: 7a280cb2f7
am: d20f2dcde2

* commit 'd20f2dcde2c777e468258ca71303404638a0ae0d':
  Pass more information to the attribute parsing functions.