update fron jellybean branch

Change-Id: I60b3399bee14768f35746630df8c639cafc46f4b