Merge changes from topic "adbd_apex"
am: e24a4b37b4

Change-Id: I7ba9f5a4934ee1fdaf40a646a9846a4e27702ef7