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