Reconcile with jb-release am: da0ba6beec am: af2d1c660c

Original change: undetermined

Change-Id: I3a78fb187c3b7877855232b24a22f4350802cb68