3.69

Change-Id: I512d2603db556be15a0ce2bc6ba089edd5984dc4
Merge remote-tracking branch 'pa/jellybean' into jellybean