Merge "Remove the usage of hidden API and simplify the design" into sc-dev