Merge "Update raven SVN to 69 am: ff982eb8d2 am: 1e63c12c5b am: a188c6efd1" into udc-qpr-dev-plus-aosp