Reconcile with jb-release

Change-Id: I71c3f35d846f61dcded1e4fb5ec2eec81da805e4