Pull from upstream KBC-developers:aosp-jb-mr2