Merge "Add some keys into proto to unblock my project" into rvc-qpr-dev-plus-aosp
tree: d8fdeaa0e1ef1ff457a7a5b9ae3205636a2a5d2e
  1. tests/