Merge changes from topic "adtConversion" am: 9410d2ed17
am: 6a728fc42b

Change-Id: I6f5bf606baa0011733e4e5ccb0b7fd2c326d233c