Release 1.8

Change-Id: I728c3a15ddcc47085703cd83b291de8fabd6728d
Release 1.9

Change-Id: I15eae97e600eb8aa1774cee4f43fc6eae93527e5