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

Change-Id: I45d5b964041351e4500b7d9fbea69e9c573a24a1