Merge changes from topic "adtConversion"
am: 9410d2ed17

Change-Id: I0417d33612c6ec8b1eff402112bbbeba83430afe