Started to clean, HAD to finish

Change-Id: I1c6ec14f1302301e673be6b3644d9564abca0293
Merge "Started to clean, HAD to finish" into jb42