merge issues fixed

Change-Id: Ib8693f499c57f7458f8329c2d8c729630a4220b8
3 files changed