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

Change-Id: I8cf14618968680da15a8f631afd243da5a1e96d8