am 2381f06f: am 24605338: Merge "Fix metadata access" into klp-dev

* commit '2381f06f374ee0cb8bca0edf5388394432b00e6d':
  Fix metadata access