Merge cherrypicks of [16064396, 16064361] into sparse-7825780-L03300000951566358

Change-Id: I7bdc1616b957b801df66deeebf54f9c86eb939f1