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

Change-Id: Ib6e1a86a8e6b968d03c063e6046b6957a2173689