Merge "Remove ConfigFlags" into pi-dev
am: cf31bf85a9

Change-Id: I9d3eb98345bb939b3cd739158c0cffe70d839fde