Merge "Revert "Keep a light version of the SBN around"" into qt-dev
am: eb8b30d226

Change-Id: I4910b3525dccb001e48ba4134fda9aaf85a7cbdf