Merge "Ensure thread-safety of SimpleDateFormat" into rvc-dev am: 78552a888a am: d32dd103fd am: 18112f7f2d am: dc7ac97950

Change-Id: If1a1ca437c1da16105b88dbda7f9d7f5d193be75