(no-ticket) Further changes to improve code rating.

Change-Id: I08d899aa155bb469bc9076201b4ee7db1042732d