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