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

Change-Id: Ibd37c716124bb765ea51a491011239a03a724223