Make ondemand gov play better with our base. Merge with AOSP.

Signed-off-by: Tk-Glitch <Ti3noU@gmail.com>