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

Change-Id: I99e67247e597252f2ccf9e0d729b566755a5132b
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>