VPN: convert prepare() into a form which helps solve race conditions. am: 3e2e1da0a0 am: fda32f27a2
Original change: undetermined Change-Id: I782a61303cc1d396e09c4dbcca139b4bd8ca1535
This commit is contained in: