Merge changes from topic "move_bionic_to_apex" am: d75913a371
am: 1ee1f37273

Change-Id: Ic9cad088d866afebdfe5843ff3b1ae7c34778245