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

Change-Id: I0f5508a13fcf46cd51ca556c13fc43798d4a6fe7