[automerger skipped] Merge "Make bootstat container-friendly" am: 0eee579fa2
am: c83ea69db8  -s ours

Change-Id: I4cd3fc1aca8ff7fc163ca3cac9e7dcfa40623c99