Android 7.1.2 release 18
Really fix the readonly source case
am: fe577f66f1

Change-Id: I59a2c6a90e565f7f8305d03306f904fe7394348f