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

Change-Id: I670493883a18e604bb3cbc80979c76d0a725c0ef