[DO NOT MERGE] Fix silentfeedback error
am: 4fe30c66c8  -s ours

Change-Id: I0056e5b5c6ffa4d8d80e465edfe2471689e15369