Merge changes I1169beb3,If7c7b737 into rvc-dev am: 0fd43f11e8 am: 2594622b69
am: 357f1aa396

Change-Id: Ie0dabb4c2d1c6089c28a6ce820e5c9a8ada850cc