Merge changes I44dc66f9,I72ee7af9
am: cb7c0be8fb

Change-Id: I6d92a16455441f38a2f63c553ce28c9ebdbf0b15