Add ondemandplus gov

Change-Id: Ib541b6bf2819f4c30b1b7a1243898d6aa8522aad
Merge "Add ondemandplus gov" into android-4.4