Merge "Check target api version before crashing apps." into oc-mr1-dev
am: 4e733f3074

Change-Id: I41d02093b1a471123e4dffd90da8cacffa23e769