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

* commit 'e0313d2a4e07f09893f313de4de59ce9ff55c43a':
  Small WhitenessUtils changes