Merge changes I9631fc94,I7e7ade6a

* changes:
  Enable -Wconversion for RenderArea.
  Enable -Wconversion for Client.