fixing issue from mitaka to newton and then to ocata upgrade

Change-Id: I571009d3bf4d0d6db1c29ae7e5fe2d3703957f73
2 files changed