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

Change-Id: I91d1a6d037bee81c8839944e313ad80699aa3d62