Updated from global requirements

Change-Id: Icdb6e17edab010bef272dd0bf5b20973ba759282
Merge "Updated from global requirements"
Don't set CONF options directly in unit tests

The values won't get changed back after the unit test is finished causing
changes to leak out to other tests.

The flags() method handles changing the option temporarily and resetting
it after the test is done.

Change-Id: I3173076e0f4ffbbc51f52a2bd37b98f88db3ddc1
Merge "Don't set CONF options directly in unit tests"