Consolidating multiple volume flags into a single flag.

Implements blueprint reddwarf/fix-volume-flags

Change-Id: If5f2333579835483455e112351887e13d665976d
Merge "Consolidating multiple volume flags into a single flag."