Merge changes from topic "call_barring_password" am: d3b8f79365 am: c3de1b223b am: fd8bc7906c

Change-Id: I61a695feb4ec951b9051b4fe697c22575f0200a2