am c83cd7cf: (-s ours) am e7862ad8: Merge "DO NOT MERGE Change auth_type value...
am c83cd7cf: (-s ours) am e7862ad8: Merge "DO NOT MERGE Change auth_type value to 0 if AUTH_TYPE is -1" into cw-e-dev
* commit 'c83cd7cf':
DO NOT MERGE Change auth_type value to 0 if AUTH_TYPE is -1