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

Change-Id: I0c164eb98dd7265cdc67f107c3500f62dde7536a