fix platform_development branch

Change-Id: Ideae21fbdd6fdf165a4dcffe502c3ff926f3e07e