Fixed bug while loading empty metadata

Change-Id: I50d6a55069f687c4b858a6056826d338db294148
Merge "Fixed bug while loading empty metadata"