Merge changes from topic "apr19" into rvc-dev am: b67e70aa40 am: ed91f7aabf

Change-Id: I9713e76a78868c7ef2e57c697e141643e1681a81