Add manta

Change-Id: I9142030b5e3ea301cb4d83dee83a3658f8acc922
Merge "Add manta" into jb4.2