Merge "GCC compiler warning fix for sprintf into snprintf" am: d2afbe4 am: 3b4af9a
am: 32fed55

* commit '32fed55e81c423480b96c6eeb70da11067777212':
  GCC compiler warning fix for sprintf into snprintf

Change-Id: Iee25a662ffaa138196437aa48bd0dadf9ef381e8