fixed bugs with mitaka

Change-Id: Ibb0eee5e842db30d348365812e9fb04077cd3b08
3 files changed