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

Change-Id: Ib5a5cd5cec7b002183eefe341263e7fabd9a823f