Merge changes I0ed00441,I12d46493,Ib484f701 am: 0a01830612
am: 1425641300

Change-Id: I6fbd5287542ee758c6a15fff544b12bac8205eb4