jewel: cleanup and bump to p2

Change-Id: I35ed573cc2480f26bfa7360dbaa97d3fa80c99d9
Merge "jewel: cleanup and bump to p2" into jellybean