More changes for R1.10 to master merge. These were left out from earlier merge.

Change-Id: I4f0a3b870bee2e9b22d07d53d8720940206a5ce0