Merge "Add code item accessor helper classes"
am: b3e7bcc737

Change-Id: I799b010fcd8f5305bcb8597b3c9707096f69a088