Merge "Fix DefaultStackTraceCleaner to use the updated package name" am: a22ad79d7a am: 21b0422bd2
am: 1ad52091a4

Change-Id: I6149a52c3297b23534f2587708ed43388b20f2d2