updated to reflect latest changes in master

Change-Id: Id419b1ea6c2876a243b3f5c45e3df76272e3b590