Merge "Suppress clang-analyzer-core.uninitialized.UndefReturn warning."
am: a03b9a5de3

Change-Id: I97df2a0ff28f386b76d8a793753a026de565595b