Reconcile with jb-release am: da0ba6beec

Original change: undetermined

Change-Id: Id1a8ed01182ea266b2194765f3fa5703b97704f0