Updating for jellybean-mr1

Change-Id: Ida91f88fd01b87346a1863c5f94ef6397160ff9c