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

Change-Id: Ie2e229cc43849be018b0847faf38576450a9f78d