Merge "Adds error codes and maximum RAN/Bands/Channels" into oc-dr1-dev am: 38529959bf  -s ours
am: 008bc4f265  -s ours

Change-Id: I41e60974e787e66d56a70e8349e1d1c8ad05db90