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

Change-Id: I2a161298bb3523aae69852c3d397d59609180047