Merge "Update oriole SVN to 39 am: 73f513b4c7 am: f7b3c134a1 am: 6f4e7491ff" into tm-qpr-dev-plus-aosp