update from core (86343, 86344)

Change-Id: I0e419629c2121b51bbb39bfa6663703015280069