Merge "Drop deprecated EnableAPI and EnableWriteAPI settings"