Imported Upstream version 3.3.0+20140925

Change-Id: Ia245c1262418dbab519c6a66c4035505614626cc