Merge "adf: rename." am: fd877db2bc
am: c0aa2c18c5

Change-Id: I10daca643f55cba38a2cef3192d3461476f43fa7