Fix 401 status response

Fixes Bug1153718

Change-Id: I18adefdc9cf6cadee6006e9352e872dfb4de7e1d
Merge "Fix 401 status response"