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