changed to branch-jellybean-stable

Change-Id: I36938431cc0e3785c88de283fd1cefdc2e5fabd6