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