Merge "NB getError returns const char"
am: 8ef4642ef2

Change-Id: Ic1c78955aefd41bf7dca5ccce29c99a285f87b80