Merge "Remove Hidden TimestampType From CellInfo" am: c65e610c06
am: 0cce6d2bf4

Change-Id: I121c5ad4200139e7f3dde128865611ed11a306b0