Merge changes I3180050c,Ie393451e into rvc-dev am: 4f0fea0c82 am: 78ba00046c
Original change: undetermined Change-Id: Ide452a1f0ff5b7ff0103f474af14894ce09fe72e
This commit is contained in:
4f0fea0c82 am: 78ba00046c
Original change: undetermined Change-Id: Ide452a1f0ff5b7ff0103f474af14894ce09fe72e