Merge "Controls UI - Do not save empty structures" into rvc-dev am: 55bd691d2b am: 99532ba1d9 am: ea8c5ec054

Change-Id: Ie8e7bab832d2e96ef65e4913e777a71ccfea69e3