commit from eclipse

Change-Id: I6a188e87824aec94c9931267ec0b37b38c49f9a9
resolved conflicts

Change-Id: Id03cb80c6727068a866ac9d2fb6f09bea1fa3eda