am aa05ac49: Merge commit \'f0df12ae\' into jb-mr2-dev-plus-aosp

* commit 'aa05ac49db5c2a50baafedb816a404428cf6c482':