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

Change-Id: I475683bca98d019295726a21a487253ae09383a7