Merge changes from topic "bionic_fdsan"
am: 65e4751633

Change-Id: I4b25c5bef4d2133416ba699b10b48981994e42cf