Merge "Use support level ZSL and Flash only when platform supports" am: 8690a7317d
am: 92ab0d63c2

Change-Id: I919ea3df2f1f6eb99aba67fdd985e0d37a441708