Merge "Update verify-profile logic."
am: cadf24495e

Change-Id: I51aea8cbe46be29b0e61d14a4c2e001ba419e57c