Merge "added missing driver checks in Poc17_06" into nyc-mr2-dev am: 06f0974d05 am: a270ee674f
am: ba65de553e

Change-Id: I9ab9fc241e7f0b2fc1bfd31af2a93e57a334a7a8