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

Change-Id: I87b3ff9cc272f4e6410c07bf70ed68db4f4f3624