Change-Id: Ife9c4948c484eaf1e01dbb269bc61e657cc5527e
including ZIP for sample app Change-Id: Id2659ebe15094dad10da4d9bdefed527984fccd9