If metadata is not enabled by client, there is no need to enable it by default. Change-Id: I6d5bd1c04dcdf78549afac57bcaceb82602da270 Signed-off-by: Deepak Verma <dverma@codeaurora.org>