Merge "setActiveGroup null, 0 length, unwritable dir should fail" into oc-dev
am: 04b086dd08

Change-Id: I87684aacda896831863c9fe2a6fc351dd52504ad