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

Change-Id: I186d20f70fbea8c727407aaeccedf3bf8c42dd40