Merge "Add new hidden APIs" into pi-dev