Merge changes from topic "java_sdk_library_module_lib" am: 53655f77a6

Change-Id: If595eb2097debe20e19d7a3fb06de95429c0a60d