Imported Upstream version 3.5

Change-Id: I6343a24eafeb593e862cd4a7ff7ade8072a1d5ba