Merge changes Id81c9034,I49f71f91 into rvc-dev am: 8a0c8f12 am: dd80d85f am: 29406f93 am: 1a04b82f am: 3e3e98e1 Change-Id: I1381e69e38cc4d072eef6ea2df0c3d6f6f74ac5c