[CLC-965] Mapping to our own angular gem
Merge pull request #612 from yuhunglin/CLC-965

[CLC-965] Mapping to our own angular gem