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

Change-Id: I352139ad1e15e72b9b8a185817bf911beeaa3a55