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

Change-Id: I6916696a90822809768cdaf8795a85203abc4315