Merge cherrypicks of ['aosp/2213721', 'aosp/2213722'] into sparse-8937393-L93400000958251797.
SPARSE_CHANGE: If69c037f7d935f138d5c673b9a258448a9699d49
SPARSE_CHANGE: Iee02b3c3ed17995a04cba822350edb4a4e250514

Change-Id: I2d61bef14e86ec96dd8c53c030f2c6950c2847aa