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

Change-Id: I1668d7c4df58d045349db3f9c132daace03a541d