Reconcile with jb-release am: ce77d5e629

Original change: undetermined

Change-Id: Ibd184aeb4ee22dcfa7ba36cd849aab302c5afcd3