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

Change-Id: Ief9b5d54a8c12b0aa3e3eb9d37a3858d5641e6c6