Also reformats XML for consistency. Bug: 27431395 Change-Id: I468dd1582ddcabe360b8665b6f42b3248caa16a5