tree dc9bfa4ed6e7af486f62319b1ac3c58f396a81a6
parent d4c405c10e581b0f405de11d934fe2b1ac75f691
parent 0d5aa2f1cc72a89e174abab8e77d87bb8b8c8573
author Xin Li <delphij@google.com> 1548891823 -0800
committer android-build-merger <android-build-merger@google.com> 1548891823 -0800

Merge v1.8.3 into master. am: 20c1c7ab4e am: c97bfbdc4d
am: 0d5aa2f1cc

Change-Id: I9564a0b53ff24d4c7a02e2abf8d50d87b6e3d30a