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

Change-Id: I2cffab5e69c86d64363302d1df861bda7e140b1c