Merge "Fix static analyzer warning" am: 80b99c23b0 am: ea5adde769 am: c77ee43e71
am: bfc8da0c42

Change-Id: Ib162325fe8d3c40338f1fbe9be3e19a16cb1ab5c