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

* commit '4f2155518a6a8988c36cb59bcf3af6a17554db17':
  More secure and compiler warning fix for sprintf into snprintf

Change-Id: Ifda61512ee281763a0bfbe8e918a4a2b346d2579