Merge cherrypicks of [20108128, 20130255, 20131210] into sparse-9104446-L05600000957133306.

Change-Id: I90e087ec578cff9bb7155bba740e151001401d81