Clean up product flavors code
Merge remote-tracking branch 'origin/master'