Merge changes from topic 'no-bionic-prebuilts' am: a50902e4dc
am: 7ca50ac7dc

Change-Id: I8f66b289b028e5112a0897e2b3e2ca91b21fc923