diff --git a/core/store/dist/src/main/java/org/onosproject/store/flow/ReplicaInfo.java b/core/store/dist/src/main/java/org/onosproject/store/flow/ReplicaInfo.java
index 1d07c39..13f4295 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/flow/ReplicaInfo.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/flow/ReplicaInfo.java
@@ -15,15 +15,14 @@
  */
 package org.onosproject.store.flow;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import com.google.common.base.Objects;
+import org.onosproject.cluster.NodeId;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 
-import org.onosproject.cluster.NodeId;
-
-import com.google.common.base.Objects;
-import com.google.common.base.Optional;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
  * Class to represent placement information about Master/Backup copy.
@@ -40,7 +39,7 @@
      * @param backups list of NodeId, where backup copies should be placed
      */
     public ReplicaInfo(NodeId master, List<NodeId> backups) {
-        this.master = Optional.fromNullable(master);
+        this.master = Optional.ofNullable(master);
         this.backups = checkNotNull(backups);
     }
 
@@ -79,7 +78,7 @@
 
     // for Serializer
     private ReplicaInfo() {
-        this.master = Optional.absent();
+        this.master = Optional.empty();
         this.backups = Collections.emptyList();
     }
 }