Merge \"QS: Fix emergency calls only layout\" into nyc-mr1-dev
am: 7d4fc00aaa

Change-Id: I2d0981b30bd1e26098523e36176b5acf5d403120