bug 2 fixed

Change-Id: I6361fe07625fef866fc5fab450c08306f20b8f15
back to release

Change-Id: Ifd1935d1f9f1f2ef114763ba3d87395a0f64210d