Merge commit '470f54d299f1eece316a03ee3a2607f0555cb170' * commit '470f54d299f1eece316a03ee3a2607f0555cb170': Update 4.xml to the most recent APIs.
Merge commit '470f54d299f1eece316a03ee3a2607f0555cb170' * commit '470f54d299f1eece316a03ee3a2607f0555cb170': Update 4.xml to the most recent APIs.