Change-Id: I1385a8947107a7c80b32306fc587aff45536a4ec
Reviewed-by: Alan Alpert <aalpert@blackberry.com>