Merge "More secure and compiler warning fix for sprintf into snprintf" am: 4f21555 am: e05688a
am: 2af9f2f

* commit '2af9f2fe82d05c095779957d98c6987958ee9ce8':
  More secure and compiler warning fix for sprintf into snprintf

Change-Id: I738f4c0893fe0924008049c666a25d0f9bb9539f