Revert "Add new class with APIs of varying visibility" am: 59292377 am: 905bb825 am: d5c0d209 am: e8941a7f Change-Id: Ifdd9d2f81684f009a7ed45a075bb24430effe959