Merge changes from topic "move_bionic_to_apex"
am: d75913a371

Change-Id: I1440aa3cc44133e93b241cfa9b5f31ba168db37e