Merge changes from topic "apex_available" am: 5bcceefd3c am: 288e14b37c am: 16ca58c160
am: 18e257f856

Change-Id: Iec680a189418b463de1912960da5ba2ec917ccd9