Merge changes from topic "rs_vndk_step2" am: 678efa25a6 am: a909e5e2a1
am: e816e326d6  -s ours

Change-Id: I23c33520d85e422835660f51ad1ecd884a40e8f8