Fix some QC issues

Bug:6449630

Change-Id: I5aec3ffdd3032bd3d037a053f5cb86fc9f0f16e0
2 files changed