Merge "Avoid NullPointerException when updating preference intents"
am: c4b0fa5858

Change-Id: I403d380ebfbbb0c70fdf5b6c9ff51267a5163e6f