Update for 8.1 version of ADK
Further changes for ADK 8.1