Merge \\"Bug fix: support tab doesn\\'t show offline UI initially.\\" into nyc-mr1-dev am: 2373aaafc6
am: 3cdd348434

Change-Id: I66041ea6397b11ad7be3ae948d1ec18a302410d9