Merge "Implemented CompositePhoneLookup#isDirty." am: 19a60d97d3
am: f240c14dd6

Change-Id: I2f51cc66be2cc0f23fabdbed01aafd3bdab8cba3