[automerger skipped] Replace ALL_LISTS policy with JUST_WARN. am: a4ba0e442a am: 71ef453a6c  -s ours
am: 4bca509b10  -s ours

Change-Id: I57238ee35f35716cdf32881576c488b7cbf298b2