Initial upstream branch.

Change-Id: Ife09658281c6cafe47309fa379e06d5879d269a9
Imported Upstream version 1.5.8

Change-Id: Ib8efc1a5398d357d739f30d05bc01474c642f84b
Merge tag 'upstream/1.5.8'

Upstream version 1.5.8

Change-Id: If2ad2a3791d6e19e40d58aec2a22b80cc09ae82e