Merge changes from topic "am-76600349da4e4810be01a0dcf115747a" into rvc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Allow empty tokens in strict grammar" into rvc-dev am: 5fa6de7421 -s ours am: 432bbbcdf2 -s ours
  [automerger skipped] Merge "Allow empty tokens in strict grammar" into rvc-dev am: c5c9242194 -s ours am: e5496f1e73 -s ours