Merge "Fix recommended emergency number of GB." am: 8f67fce8e6 am: c0bbd4abfc
am: 05f491399b

Change-Id: I4d5c965482aededb9fc8098ddcd7bb0b24def0c1