Merge commit 'eae337cbff4e792cd0b428758ab7ba3d2474f688' into rvc-dev am: 4ee72ecf8d

Change-Id: I3fd6d2a1bbe20403333a1801020e7f473b49b1d2