[automerger skipped] java_sdk_library: Improve consistency with ..._import am:...
[automerger skipped] java_sdk_library: Improve consistency with ..._import am: dce3fe78 am: 10046466 -s ours
am skip reason: Change-Id Ic5bf884b2b1e79841843e7c3b4642796ecd49f5d with SHA-1 dce3fe78 is in history
Change-Id: Ib1d0507722349d0545e85a2108f2d726a67a9669