Merge "Demo associated with java_library build change"