Merge cherrypicks of [2194098] into sparse-8997228-L11500000956133636.

Change-Id: Iaa71b23350c7a8f61c8b6b38829ead9eda1cf50d