Merge changes from topic "rs_vndk_step2" am: 678efa25a6
am: a909e5e2a1

Change-Id: I763e01bc25323530c4cde733237eb57b61c952a2