Fixed previous merge

Change-Id: Id2df3686ddf35866253894012a73cbc6f0c5aff2