Jewel staging

Change-Id: I844a28ae7a062c7683559f7a3c6ee6b3e6a9b948