Replace combined field (YF + AF) with angular directive

Change-Id: Ie8ba632c1bb6a9a47c427c92aa620b7dd7c28485