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

Change-Id: I19eb3db2210884861983506fc37caa2f8690080d