Resolved issue with mkdir

Change-Id: I02f5b299d71ab98ab7bd044e52c4dba23e8a9186
Merge "Resolved issue with mkdir"