Reset master to upstream 9c87bdb91c373e11e9cf218122e245387e66530f and merge in empty repository history with merge -s ours. BUG: 32016180 Change-Id: I89f016501b6b224ae1e26ccb2c9a72e22937a026