am 05e7c26b: am 312c1e79: Merge "Add padding when both data icon and wifi icon...
am 05e7c26b: am 312c1e79: Merge "Add padding when both data icon and wifi icon is visible" into lmp-mr1-dev automerge: 286f3611
* commit '05e7c26b':
Add padding when both data icon and wifi icon is visible