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

Change-Id: Ib53f20469eec4663fc2f98d3be1b2dfee314d793