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

Change-Id: Ia90a5cf802318e968789aa8d5208ef73089c9d99