Merge "Merge "Refactor runtime hidden API flag from negative to positive" am: 1bd06e18 am: 01d18a29 am: 79d50b75 -s ours"