Merge cherrypicks of [15034291] into sparse-7461600-L54500000924231959

Change-Id: I53a9d6ce20806463b726c59e1bb81f5a82c748ad