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

* commit 'f7edcf75d71f66b40027d4d60f10eb1aa2771877':
  Small WhitenessUtils changes