Merge "replace CURRENT_OR_SELF with non hidden API"
tree: fd3398c14810ed9148a08e78c07db67a06ab9817
  1. framework/
  2. service/