Merge cherrypicks of [9337739, 9337740] into sparse-5845423-L32700000362467131 Change-Id: I0a527761c2d3c074da8341c770716b7a116d36ad