[automerger skipped] Merge changes from topic "adtConversion" am: 9410d2ed17 am: 6a728fc42b
am: e62fdc5564 -s ours
am skip reason: change_id If4a5c5002d6d4ccb7aaf823111b371d417784b19 with SHA1 daf49955e6 is in history

Change-Id: Ia92423538d1bb18292b13c69f8155b85bd5482c9