Merge "Creating separate flags for Time/QuotaControllers." into qt-dev
am: 956b55a733

Change-Id: I856fbbdbc4b744d437a4cb6efb794d2f0d2f1978