Merge \"QS API: Fix mService and mTile being null once and for all\" into nyc-dev
am: fc70b07385

Change-Id: I2aed24cf36354fbe332787082bcf628357bab3b1