Merge "Create dir in /data for vendor customization" am: c39a31f002
am: bfc4da8369

Change-Id: Ib93262f3d44f879eca773f1050a72da7c456f563