Merge "Give hidden API behavior to legacy apps." into rvc-dev am: a7a96ad6 am: 314eb8f1 am: 6ce32155 Change-Id: I291721e059e3ee80caadd8a50abc20db74102494