pa 3.67

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