3rd party changes

Change-Id: I11c861b6fadbc27a61466e3ee58c05af5abdc01d