Merge "Make @SystemApi happy with signature change." into pi-dev