am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was...
am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."
* commit '4b72eec3':
Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.