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

Change-Id: Ib23305be0f628cdb858d791474737bbfa34a13ea