Merge changes from topic "adbd_apex" am: e24a4b37b4
am: 680129fd2f

Change-Id: I3e4a7bb111296fbd6fbc68025b5f19b5eacadd1d