Add Jeellyber updates and branch

Change-Id: I7a3cc938f50b8588669df4040cd2220206a8f433
Add Jeellyber updates and branch

Change-Id: Id566ed08f533073182ca095cba9cdb4ae6a69d23