Merge \\"fix last modified time\\" into nyc-mr1-dev am: d73d2a3a3d
am: d84d425bfa

Change-Id: Id59d1806d521e0aa0b0ddc31a636f5776abdee45