Reconcile with jb-release am: ce77d5e629

Original change: undetermined

Change-Id: I3130109c038c21fb9b845479a2afd19e5fd801df