[automerger skipped] Prevent information disclosure in rw_i93.c am: 0a61f668bd am: 5ea42a03f7 am: 629f00e8e2 -s ours am skip reason: Change-Id I1d33d80760be986af9905304c17ce05cc0f9ce63 with SHA-1 712dcda250 is in history Change-Id: I12e39bc48d81f408ab62750533867e3c85d51f06