Merge changes from topic "host_bionic"
am: 691ad1490c

Change-Id: I60846275ef5d68a408280a0e86034adb4a8689cc