[automerger skipped] Merge "Reset the profile when system application change version." am: 1771240c80
am: 16523acfa2  -s ours

Change-Id: I8bcfbe9b24ba85ef724dda69252c5a1d34e3f6a3