Merge tag 'release-1.8.1' into gtest
am: ff1b400c27

Change-Id: Ie1be20c0cdacb3d9dcac94233752a44169d0c445