Merge "Merge "Add constants for reporting criteria" into pi-dev am: a210ef2687" into pi-dev-plus-aosp
am: f53bcef0e1

Change-Id: I8577418f624a19dbb5126708f84499e1a9a3eab1