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

Change-Id: Ia5d655f3ce6bb760574bd5abd02115d9284ea395