Reconcile with jb-release

Change-Id: Iad375a456e4243fce9a4e651d1c831dc5bd69451
tree: de2d0412728d1417166d78dd1758f5fa6ce5873c
  1. framework/