pa 3.65

Change-Id: I1c02e502d0568edcfe117c1b41c2237f4b3f1d3b
Merge remote-tracking branch 'upstream/jellybean' into jellybean