Merge "Rename manual hidden api lists"