am: 8966b8e5 Bug: 74435522 Test: traceur can share to betterbug Change-Id: Ic24196b6a4050696d92f18a6879c569ccf5eaec7 (cherry picked from commit f66fd522)