Merge changes from topic "rs_vndk_step3" am: 51ec0a1387
am: 1d69a95b0d  -s ours

Change-Id: I3edeca5baeeea9c9ed3894c6b02841718167d9d8