Merge "Updating warning messages for getTransport." am: b7b89dbc02 am: 1d83fed7e3
am: 395c142e0e

Change-Id: I51bbd749530b1030f9fde0c11c07174c1fe7d071