Fix Merge error

Issue-ID: AAF-1040
Change-Id: I98e8184c0ecf92e87f0fa43a05b09071ae7dd8a2
Signed-off-by: Instrumental <jonathan.gathman@att.com>
1 file changed