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

Change-Id: I4572704ce157aee9ff59cdaa8610abd2ed171b8d