Merge "Create hidden API lists" am: b6a5c92b50
am: 265863f9d9

Change-Id: I4d32dccc7c00216102b6bd91ed1f185c03c2c048