Merge changes from topic "adbd_apex" am: 32dce08529 am: f4f271e2a2
am: bf51100b55

Change-Id: I8cb24e89975d686a4ab3584e38cd74159e551b42