Merge "Switched wtf in DimLayerController to warning instead" into oc-dev
am: d0c3b9c685

Change-Id: Ia75c5e478341cac25a7783ee058edd89bd05e7e8