[automerger skipped] Merge "Update reporting criteria tables with more values"...
[automerger skipped] Merge "Update reporting criteria tables with more values" am: 8fe6cac3 am: 3d0db266 -s ours
am skip reason: Change-Id Ie1d56aa633a4047f6bbb9badbaba2e7804414b53 with SHA-1 dfec8385 is in history
Change-Id: Iec7a6f3c520b576e45feb09da5b8af735a313c13