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

Change-Id: If04ff58b8d3911b3799cac822f56afda2872b111