Merge changes Id2b99e6d,I32f5469f,I922e3a56 into rvc-dev am: a95d3927 am: 57dc4261 am: 75b45568 Change-Id: I636a72bfb2b80469b70641dbb9b125ba94cd4660