Merge "Fix static analyzer warnings." am: 4b547a1516
am: 508db351a1

Change-Id: I123d86d49b0f17d74d7108f101720101254ea810