Merge "Merge "Refactor runtime hidden API flag from negative to positive" am: 46b4862d20 am: d0f327cc60 am: 2c426bc3f4  -s ours"