Merge "Fixed scenario where an authentication response has no dataset." into oc-dev
am: 1c38d29482

Change-Id: I09159b6fd7b41e17e099da9ac5fa3ef7a5f0d6b2