Merge "Added data coding scheme and location check time support" am: ad194f332d am: e1f9b607d7

Change-Id: I5dcdcc49bf45a311264c0fc72d0c41845768574d