Merge "Resume-on-Reboot: change SystemApi calls slightly" into rvc-dev am: f3772755 am: f2ef6b0d Change-Id: Ibcf2047e767c6dca11e9383511f78ff8bcf23185