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

Change-Id: Ie6db06ce5747bab1f995a05a7aa624b0547e725a