Merge "Add <p> to UnsupportedAppUsage javadoc."