Merge changes If4e8e87c,Ie8e48422,Iab4974f9 am: c0f6f60d8e

Change-Id: I1ce3616e8604fcf179b7c118799d0df0a4995e9d