Edit branch jellybean

Change-Id: I43edd2f11a3bf7dfe8cc4673d999b3d6eb8865f6