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

Change-Id: Iaf861b4ec0738daa05002a9060dada4612a6a5d9