Hide more shortcut APIs

Change-Id: I0ee8113986ef0f451ab97aa0be5b974b30e7453e
2 files changed