Build Flag Changes

Change-Id: I9e355f189b91664ece29c0cb9b04a1bdb572fde7