Merge "Add target sdk check for behavior change." into oc-dev am: e5e246ce5c
am: 4e76728dea

Change-Id: Ia31e1eefe3771f5cc76b53112e01efdedfe55c58