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

Change-Id: I9a66c1da447e7b7681d999499a6547af62313d1e