Merge "Hide empty text view when airplane mode" into rvc-dev am: 589c5c5571

Change-Id: I4902ac9d03382e79022db7398f24cd953e7b23d6