Fix for _DTM_ schema, Launchpad 1365202

Change-Id: Id554b2fb87f75a97800cc47a2082b81ab7d07a49
Merge "Fix for _DTM_ schema, Launchpad 1365202"