Merge "framework is not available to APEXes" am: f65e0e3181 am: c3711cf7af

Change-Id: Ief31b4c5c69baa122254ce75e183e116bb22675c