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

Change-Id: I4024fa71094ccd91b545d177bedcf0734b8c4c26