added manta

Change-Id: I2db4bd831cd3f26a9129dd9abbae34aab8bf72f1

Change-Id: I2db4bd831cd3f26a9129dd9abbae34aab8bf72f1
Merge "added manta" into jb4.2