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

Change-Id: Ia781def22313c8e1fa431a459e22f8ccd3b4bff3