Merge "Fix missing check on buffer import." into oc-dr1-dev
am: e018119bb3

Change-Id: I6adb37b5f821338608ed19ce35384a63f4d5f7ba