Merge "Add constants for reporting criteria"
am: a36ada4b95

Change-Id: Ib928d0de3e7e33a5efec3b5d5fe6e99f2782058d