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

Change-Id: Id18345701037b6306f2fec8dc233cd2fb1760833