am 1c45c0ff: Merge "resolved conflicts for merge of 074ee014 to mnc-dr-dev-plus-aosp" into mnc-dr-dev-plus-aosp

* commit '1c45c0ff5d1cbd49d2d77fa837e1be0724fa77b3':
  Remove creation of root directory folders