Merge "Add # apex symbols." am: 56bd0c9c86 am: a1ad0868e4
am: 20089bd2d3

Change-Id: Ic24f75c324189f9a324f7da1c6f14dfd51fcedbe