Merge contacts src-N/ and src-pre-N/ dirs (1/3)
am: 2cf389622f

Change-Id: I2d82a1d091e22c5a023533e926a7c293229f42ec