Merge "Fix a bug when calling onError(int)" into pi-dev am: f7e6b29718
am: 40273bc5b2

Change-Id: I0d47f6c3bb7bcfa9157e053fa047c143b91fa7ed