am d9de2f66: am bb077798: Reconcile with jb-mr1-release - do not merge

* commit 'd9de2f6652a8a7f7d5b348bccd7b842ac3d5716d':