Merge to upstream r355142.
am: cc3148bd34

Change-Id: I7572edd768215423426dff6f42e92dc716cc5f3c