Merge remote-tracking branch 'quic/tmp-49d7613' into msm-3.4

Change-Id: I5ff7d85df0192eb8813f9b94440010a3b3f4a61c
Signed-off-by: Sridhar Parasuram <sridhar@codeaurora.org>