am 6a13e8da: Merge "More cts-verifier tests for profile-aware Settings." into lmp-sprout-dev

* commit '6a13e8daef95e32b24ed31056e1536423eade320':
  More cts-verifier tests for profile-aware Settings.