Merge changes I5c3e1625,I51fc5cb2 am: 3eb4eee4c9 am: 3477dfc201 am: d739dcac06 am: 32905a5fdd am: da32b6f127

Change-Id: I075eecaa6a3a2cc41a5d8211fef9619a05545c1e