Merge commit '1bd7597b8cdaf39d1183077c463cb30596eb31b0' into kraken * commit '1bd7597b8cdaf39d1183077c463cb30596eb31b0': Replaced raw string arguments for Context.getSystemService() with final Context variables