Add missing changes Part 2

Change-Id: I0c101d168028f6edadaa1f0df7feec6051ef7702