This should've been merged in with cr/704. Whoops. Change-Id: I1fe18a74462e8bdc0350c5ba26b51261b76c7ae1