Merge "Fix error codes 100-127"
am: 70f04737a2

Change-Id: Ic58daa6ec3f92312c1b61b47f2bafe3c99c5346f