Merge "Stop using SystemApi.process per the latest spec" am: 3f1da9399d am: a01989d8e4

Change-Id: I95324fc08d9a93263248c8a4990a9cb4b5488cac