Merge "Add closing div tag for ContentResolver javadoc" into pi-dev