Merge changes from topic "move_bionic_to_apex3"
am: a15f385821

Change-Id: I85ee4d85f75bf77f487961b5194ec00c85296e33