Reconcile with jb-release am: ce77d5e629 am: 568058b91f

Original change: undetermined

Change-Id: I78fa481951dc1ff25f1e15574fe70e681dec9504