[automerger skipped] Mark updatable APEXes am: 3b995c238d am: 2efbe6d734 -s ours
am skip reason: Change-Id I47c7f22d6834a8cecce3efb9985ee04732dc5994 with SHA-1 d0aa58dce7 is in history

Change-Id: I4e10398ff86146324b47c147cb6719eed8fd160a