This patch removes all flavor series references in code. Change-Id: Ief91bb3f05a27262354eef9b2f8db28866360fea