diff --git a/src/android/support/design/widget/CoordinatorLayout.java b/src/android/support/design/widget/CoordinatorLayout.java
index 4dcce62f0..db9eede98 100644
--- a/src/android/support/design/widget/CoordinatorLayout.java
+++ b/src/android/support/design/widget/CoordinatorLayout.java
@@ -1495,10 +1495,10 @@ public class CoordinatorLayout extends ViewGroup implements NestedScrollingParen
             final int dy = desiredChildRect.top - childRect.top;
 
             if (dx != 0) {
-                child.offsetLeftAndRight(dx);
+                ViewCompat.offsetLeftAndRight(child, dx);
             }
             if (dy != 0) {
-                child.offsetTopAndBottom(dy);
+                ViewCompat.offsetTopAndBottom(child, dy);
             }
 
             if (changed) {
diff --git a/src/android/support/design/widget/FloatingActionButton.java b/src/android/support/design/widget/FloatingActionButton.java
index eed92f015..e000656f2 100644
--- a/src/android/support/design/widget/FloatingActionButton.java
+++ b/src/android/support/design/widget/FloatingActionButton.java
@@ -788,8 +788,12 @@ public class FloatingActionButton extends VisibilityAwareImageButton {
                     offsetTB = -padding.top;
                 }
 
-                fab.offsetTopAndBottom(offsetTB);
-                fab.offsetLeftAndRight(offsetLR);
+                if (offsetTB != 0) {
+                    ViewCompat.offsetTopAndBottom(fab, offsetTB);
+                }
+                if (offsetLR != 0) {
+                    ViewCompat.offsetLeftAndRight(fab, offsetLR);
+                }
             }
         }
     }