Manta Makeover

Change-Id: I447846aded49e7e0ce6d51ef58c484025fb0ccb5
JSS15Q in fingerprints

Change-Id: I42763dd25615769d02d45a4107769d3ba22c8d2c