diff --git a/app/metrics.yaml b/app/metrics.yaml
index c033b0455..3f052289a 100644
--- a/app/metrics.yaml
+++ b/app/metrics.yaml
@@ -2037,48 +2037,56 @@ installation:
     expires: "2020-09-01"
 
 browser.search:
-    with_ads:
-      type: labeled_counter
-      description: >
-        Records counts of SERP pages with adverts displayed. The key format is ‘<provider-name>’.
-      send_in_pings:
-        - baseline
-        - metrics
-      bugs:
-        - https://github.com/mozilla-mobile/fenix/issues/6558
-      data_reviews:
-        - https://github.com/mozilla-mobile/fenix/pull/10112
-      notification_emails:
-        - fenix-core@mozilla.com
-      expires: "2020-09-01"
-    ad_clicks:
-      type: labeled_counter
-      description: >
-        Records clicks of adverts on SERP pages. The key format is ‘<provider-name>’.
-      send_in_pings:
-        - baseline
-        - metrics
-      bugs:
-        - https://github.com/mozilla-mobile/fenix/issues/6558
-      data_reviews:
-        - https://github.com/mozilla-mobile/fenix/pull/10112
-      notification_emails:
-        - fenix-core@mozilla.com
-      expires: "2020-09-01"
-    in_content:
-      type: labeled_counter
-      description: >
-        Records the type of interaction a user has on SERP pages.
-      send_in_pings:
-        - baseline
-        - metrics
-      bugs:
-        - https://github.com/mozilla-mobile/fenix/issues/6557
-      data_reviews:
-        - https://github.com/mozilla-mobile/fenix/pull/10167
-      notification_emails:
-        - fenix-core@mozilla.com
-      expires: "2020-09-01"
+  with_ads:
+    type: labeled_counter
+    description: |
+      Records counts of SERP pages with adverts displayed.
+      The key format is ‘<provider-name>’.
+    send_in_pings:
+      - baseline
+      - metrics
+    bugs:
+      - https://github.com/mozilla-mobile/fenix/issues/6558
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/10112
+    notification_emails:
+      - fenix-core@mozilla.com
+    expires: "2020-09-01"
+    # TODO: https://github.com/mozilla-mobile/fenix/issues/10599
+    no_lint: [BASELINE_PING]
+  ad_clicks:
+    type: labeled_counter
+    description: |
+      Records clicks of adverts on SERP pages.
+      The key format is ‘<provider-name>’.
+    send_in_pings:
+      - baseline
+      - metrics
+    bugs:
+      - https://github.com/mozilla-mobile/fenix/issues/6558
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/10112
+    notification_emails:
+      - fenix-core@mozilla.com
+    expires: "2020-09-01"
+    # TODO: https://github.com/mozilla-mobile/fenix/issues/10599
+    no_lint: [BASELINE_PING]
+  in_content:
+    type: labeled_counter
+    description: |
+      Records the type of interaction a user has on SERP pages.
+    send_in_pings:
+      - baseline
+      - metrics
+    bugs:
+      - https://github.com/mozilla-mobile/fenix/issues/6557
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/10167
+    notification_emails:
+      - fenix-core@mozilla.com
+    expires: "2020-09-01"
+    # TODO: https://github.com/mozilla-mobile/fenix/issues/10599
+    no_lint: [BASELINE_PING]
 
 addons:
   open_addons_in_settings:
diff --git a/app/pings.yaml b/app/pings.yaml
index 0c5dcf2bd..5a392f005 100644
--- a/app/pings.yaml
+++ b/app/pings.yaml
@@ -31,12 +31,12 @@ installation:
     - fenix-core@mozilla.com
 
 startup-timeline:
-  description: >
+  description: |
     This ping is intended to provide an understanding of startup performance.
 
-    The ping is intended to be captured by performance testing automation to report results
-    there, in addition to user telemetry. We place these metrics into their own ping in order
-    to isolate them and make this process easier.
+    The ping is intended to be captured by performance testing automation to
+    report results there, in addition to user telemetry. We place these metrics
+    into their own ping in order to isolate them and make this process easier.
   include_client_id: false
   bugs:
     - https://github.com/mozilla-mobile/fenix/issues/8803
diff --git a/buildSrc/src/main/java/AndroidComponents.kt b/buildSrc/src/main/java/AndroidComponents.kt
index 7bea9b7c3..d45fb35b7 100644
--- a/buildSrc/src/main/java/AndroidComponents.kt
+++ b/buildSrc/src/main/java/AndroidComponents.kt
@@ -3,5 +3,5 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 object AndroidComponents {
-    const val VERSION = "41.0.20200511120152"
+    const val VERSION = "41.0.20200512130104"
 }
diff --git a/docs/metrics.md b/docs/metrics.md
index 795856219..2e2ee0c8c 100644
--- a/docs/metrics.md
+++ b/docs/metrics.md
@@ -257,7 +257,10 @@ The following metrics are added to the ping:
 ## startup-timeline
 
 This ping is intended to provide an understanding of startup performance.
-The ping is intended to be captured by performance testing automation to report results there, in addition to user telemetry. We place these metrics into their own ping in order to isolate them and make this process easier.
+
+The ping is intended to be captured by performance testing automation to
+report results there, in addition to user telemetry. We place these metrics
+into their own ping in order to isolate them and make this process easier.
 
 
 **Data reviews for this ping:**