Merge "Merge "Refactor runtime hidden API flag from negative to positive" am: 46b4862d am: d0f327cc am: 2c426bc3 -s ours"