Merge "Merge "Fix SmartspaceService callback comparison." into tm-qpr-dev am: 7f47d9d49a am: 595d584b57"