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

Change-Id: I4721197b1329a14aa51f1b49a05bdade1fb71ef8