Merge "Clean /bionic"
am: ac74615c1c

Change-Id: I82fbbabac2eeee7c6453fd3128032686b0209709