Merge "Drop REASON_SHARED_APK." into oc-dev
am: 474662da39

Change-Id: I4005a889c3ddca82dd8450b265205d6201a63ebb