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

Change-Id: Ia68d1b5d4c6e58fac1f6b9b57144d231f9aed43e