Merge "Revert "Expose more symbols temporarily""
am: 05ca47512c

Change-Id: I65d09b915c46f5e09864c17d06e0a78af010922e