Merge "Calarify SimpleDateFormat symbols X documentation." am: fdf519b928
am: 071b361966

Change-Id: Icb8054f95efe479a7cb87e55c9435499cc192af6