Merge fix

Change-Id: I614c31262df9bf221b6973849af5884ed3424d2f