Merge changes If5ccacdd,I381a083d into rvc-dev am: c9035d7d am: 370809e2 am: cd78a7be am: 70b65f1d Change-Id: I3a2b1d644ed1a6b5ea2d44821da3e8c3385778cc