Bug 522137: Improve code quality fixed several trivial warnings Change-Id: Iee21c31f7f298e3acafe514ecbbcb7d5be91c3fe