resolved conflicts for merge of 6a67a38f to jb-mr2-dev-plus-aosp