Merge changes Id81c9034,I49f71f91 into rvc-dev am: 8a0c8f12f5 am: afa18ef0d7
Change-Id: I7e47c603a74f5916a5c499668cf45ebf5f03af7a
This commit is contained in:
8a0c8f12f5 am: afa18ef0d7
Change-Id: I7e47c603a74f5916a5c499668cf45ebf5f03af7a