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

Change-Id: Ia427a3a51df397d89630f4e7c8a81ba20fffca10