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

* commit '44d27e77258247325a12277c6ec9e3a615e98857':
  GCC compiler warning fix for sprintf into snprintf

Change-Id: Id44607f14ad88ebf80810f12256110f688196601