Merge changes from topic "rs_vndk_step3"
am: 51ec0a1387

Change-Id: I99cd5841a18417b6edd38f403efde4a867715b9a