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

Change-Id: I79112e179cb379d394324beccbf5512fa8d05bbf