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

Change-Id: Icd89ba677204be19dfbba557f999d53cfbd687a7