Mark updatable APEXes am: 3b995c238d am: 2efbe6d734

Change-Id: I89efb834196b437bdd023c3a06701c73b962e511