Merge \\\"QS API: Fix mService and mTile being null once and for all\\\" into...
Merge \\\"QS API: Fix mService and mTile being null once and for all\\\" into nyc-dev am: fc70b073 am: c552a369
am: 6a06372b
Change-Id: I8164179f96be4195bcafb3528e8dcbc45946bee2