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

Change-Id: I79e5ce8c90b2033ba3ff497d7b22d03327100e6b