Merge "Remove ConfigFlags" into pi-dev am: 9333d5c68b
am: e2506f4ef5

Change-Id: Id09894e5b4fcacf068ffcbfb6d12cd03212746d5