Merge changes from topic "move_bionic_to_apex3" am: a15f385821
am: 90b7095cf5

Change-Id: I991844dca444abbf4ad3c589976a516d951f66c0