Some fixes from merging MISC_FIXES config

Change-Id: I3f77e952af3c441a50479bb5d278ea0fd6cf62c6
4 files changed