Merge "Modify time only mode flag into set of values instead of just one." into pi-dev am: c5d0ed9f3c
am: 74d615f1ac

Change-Id: I98aaa71b0988e96d079ed1813dbb777565c3d655