Adjust formula to be built

Change-Id: Iea17dc349789247bcbdf88f72c841cdaa23e752f
23 files changed