Merge changes from topic "revert_move_bionic_to_apex"
am: e0c7a8bbdd

Change-Id: I7d6857980fd2bcfcaeb320971b6b593d11415dbb