also
coverity#706515
coverity#706516
coverity#706517
coverity#706528
coverity#706529

Change-Id: I5beb753d5cc8ed976b3c11319cc36415adebd1e6