Merge "Remove incorrect annotation - @TransportType" am: 7f81046bed am: 1e2e0892ba
am: e7654519fb

Change-Id: Ib551ea9fbdfd0a927c4570560ba74148e43453c1