Don't Fail on Platform Detection

Change-Id: I82102269f39c5d69bb3258a491efa97896f5fcf3
Cleanup

Change-Id: Ib86eb93dc9426283195c7cbd47beecbe254a6a56