Merge changes from topic 'adf-uapi-cleanup' am: ae03c6917d am: 16cebae0af
am: 556ae0c7b8

Change-Id: I28584d9fc61df73441eebac42bc4f26509c00c43