Merge "Glonass ID Revision" into nyc-dev am: 0b1e0f0e48 am: f40e091264
am: 2fb5125398

* commit '2fb512539856c3aad05f28c31a1d85dc7ae219ca':

Change-Id: Iea32acf9761668b7d50fe3e3d1a6110c22d6b5c3