updated manifest to be cleaner as well as for gerrit

Change-Id: I10eda7596dc4b3d47ec0ac094d8a106b316de0df