For now, can still be disabled in Developer Settings. Change-Id: Id871d1e232de7b3c7be42c7734f2bb83dc526b32