Merge "adf: rename."
am: fd877db2bc

Change-Id: I1b30c965b92286f84c13c56d71770bb79ce981dd