Introduce the ability to annotate profile samples am: 6a98c95feb
am: d08d5bfb13

Change-Id: I67fe8e79c326478382ca746213d86b002754c1bc