Merge changes Ib5b3b032,I81147568,If9218d23 into rvc-dev am: 381b9c17 am: fb69fb80 am: a9fdbd00 Change-Id: I83afd5a9354454e538b2b843dc5ed9bd6c32f5d0