Code review changes for Bugfix for lp904407, /extensions tests

Change-Id: I882f8170c69e5fb3690288a4a763ec2090e5167a
3 files changed