Merge "Restore SystemProperties.PROP_NAME_MAX to keep Kindle running." am: ef9c425416
am: 40c4210f8f

Change-Id: I264f92773692b2c5cdc58adac808630a31d2569f