Merge "Review of suspend/unsuspend APIs" into pi-dev am: 2188383b8a
am: 03026cb894

Change-Id: Ifd15ef4d5db195b862cf800cf0d2fff11b26745d