bionic: a series of CM commits from the 18th and 20th

Change-Id: Ib2f66700c88fc0fd7fdeaf80ebe1d74ffdc38853