Merge "Merge "Do not hold lock when trying to get snapshot" into qt-dev am:...
Merge "Merge "Do not hold lock when trying to get snapshot" into qt-dev am: beee882c am: c98d8a91" into qt-r1-dev-plus-aosp
am: 9f11bc0c
Change-Id: Idfa9a17108ade54d060adf9f15f7a4e751d7998b