Merge "Modify SystemApi so it can be used by CTS to trigger incident report"