Merge changes from topic "revert_move_bionic_to_apex" am: e0c7a8bbdd
am: 555b7ead70

Change-Id: Ibdd191f5e6e4c7fc953bc39a050afa7b23c4335e