Merge fix

Change-Id: I03f21a22c8472d7253e814069028e0169c6d1e7a