Patching mainline changes to puppet local repo

Change-Id: I80c1ff2bce13008556e74c4d7a4f208678653a1f
Merge "Patching mainline changes to puppet local repo" into R1.10