(Note, I renamed the directory to match the project name and the name used in the Mitaka cycle) Change-Id: I6a947c90e90ace7b900d241bebb19866d594700b