Merge "Drop REASON_CORE_APP." into oc-dev
am: f451f7b05b

Change-Id: I9b0063311a73f363c63501a96916e5b8c6f0f0e6