fix dts path

Change-Id: Id4e0bcab2d8789d31923bed7212a8b8a474f607d
fix typo

Change-Id: Id4e4c960222ae985f1880fce2e3d51707cd5f69d
merge from common

Change-Id: Icff86cd5854dd9f68c923279b66aa2937a14f607