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

Change-Id: I8cb24e89975d686a4ab3584e38cd74159e551b42