[automerger skipped] Merge "Added data coding scheme and location check time support" am: ad194f332d am: e1f9b607d7 am: c98f1e7bcf -s ours
am skip reason: Change-Id Ib5b78802e7548da9f92492aae4c94ed3488b5e3d with SHA-1 641db9a36a is in history

Change-Id: If7d6971f4cbb4d586ee603cdee0faba8b7227845