Merge commit 'f0df12ae' into jb-mr2-dev-plus-aosp