Merge "Make sure to return false for empty classpath"
am: 776e172712

Change-Id: I31ae68825db7f1ecf52117c2eed025d80c6e2647