Merge "Update account visibility test apps to handle O SDK level." into oc-dev