Merge "People don't read warnings." am: ea41708f12
am: 602393351b

Change-Id: Ic4b45ab93ddcba88e76700496a5f73db5e32d99a