Merge "Drop REASON_CORE_APP." into oc-dev am: f451f7b05b
am: 31f7a2859b  -s ours

Change-Id: Ice5c6b065d580e55ff2e6b8d9a670da4cb3a0c8c