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

Change-Id: I547ce2aa20cc0fa12115c7c4a33e0c026084a191