Merge "Fix static analyzer warnings"
am: 7176951b9b

Change-Id: Ie0e915a07644d0537b3e29a3b756705d45703e7f