3c39c12fe5
Merge commit 'f2b3fcf5a7e7fb69edc68ef3203a3f169278025c' * commit 'f2b3fcf5a7e7fb69edc68ef3203a3f169278025c': Add updated API diff based on 4.xml.