3.69

Change-Id: I98464d77608b3a18ec39fdcc979dec3ffa09e58d