Merge changes Icda006de,I3590beeb into rvc-dev am: 6a6d06f5ba am: 359c819cd2 am: 3b2ee3b579 am: 0c1629e694

Change-Id: I9b6685754e3df9df1dda72f8843559e1bc59288f