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

Change-Id: I83a856cd41565689f6844bdf3dd91085f6916aad