am cdbddac7: Reconcile with jb-mr2-release - do not merge

* commit 'cdbddac7b62c78a998ffce85f6a0e9b2209421f2':