Merge "Fixing NPE issue with GuidanceStylist." into nyc-dev am: 0ab5f96
am: b25524a

* commit 'b25524af38ac0dca037387edd2efff2f250f30ee':
  Fixing NPE issue with GuidanceStylist.

Change-Id: I6cbc50d8b22662c119ff875655c35908c2d8de17