Minor fixes

Change-Id: I5d1d38242340056d711b4325b9b6bc7bfd32e0a4
(cherry picked from commit 5a32da0d23b82daa5a22923c0ecacfbdfd5d3c7a)
1 file changed