Merge "Extend adoptable override to force on or off." into pi-dev am: 130a2503d8
am: 64a615eefe

Change-Id: Ic80dd00d179adac426daed862236b03936b60bd7