Merge "Give hidden API behavior to legacy apps." into rvc-dev am: a7a96ad6f8

Change-Id: I8ae0b1ef44a556c46a070a84cd691ee7f8cbb991