PA 3.68

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