Merge commit 'fd70d796' into rsa_3.4.2 Inital commit of rsa 3.4.2 with history...
Merge commit 'fd70d796' into rsa_3.4.2 Inital commit of rsa 3.4.2 with history am: d8ac8301 am: bb1c2ded
am: 0b85440d
Change-Id: Iac396b96a067c6bb95fddbd0fbbd5f6c014c83b4