Merge "Clear the profile if we fail to add new methods or classes" am: d10995609f
am: f71fe6ed6b

Change-Id: Ifb1be146715ee0f7feb269f5ada5e564367a591b