Merge "Convert compilation reason and filter to int-enum before logging" into pi-dev
am: dedfd8fec7

Change-Id: Id147341527f602e2fa0d2a88f7e01281293d36a8