tree 7e4c317912ac3809fbff11bb692084debd4a27eb
parent 4cbb612299eaf8259db25f5dcda46022fbd1db54
author Feng Xiao <xfxyjwf@gmail.com> 1434417708 -0700
committer Feng Xiao <xfxyjwf@gmail.com> 1434417841 -0700

Down-integrate from internal code base.

[ci skip]

Change-Id: I9391c09640e0b0b2b21c45a97a1fc91814d95c5d