Change-Id: I4acde09e00ea4e5450dcb0fd26bbb2c3afa767f6
This helps to cleanup the cmd folder a bit. Change-Id: I24025c3dbfd35966325d7d5aaa95cd9a1176a8b7