Merge "Must not use API26 implementation if the methods are not avaialble." into oc-support-26.0-dev am: 947f335c39
am: 6113193dab

Change-Id: I6eec06c5ee779d288f9ad2bf17b6e127630ba0f4