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

Change-Id: Ic1b4d114e9a6acd63838a5733440c5691655d9bb