am b1588c4a: Merge "Small WhitenessUtils changes" into lmp-dev

* commit 'b1588c4aab14c600fae9e09423cb08ba47685c49':
  Small WhitenessUtils changes