Will patch flavor to it once flavor code gets checked in Change-Id: I9b0b579f2977d07df44ac8f0b527a8ce39578f17