Merge "Clean /bionic" am: ac74615c1c
am: 605fc73ebb

Change-Id: I9fa89b231e5c96c121860776fb5c8c5fb2e4c5f2