Merge changes I3f69e410,Ieccf3b8e
am: 5e705a5636

Change-Id: If8b220b5c401f838a4084ff20fe5b1b20d43aee9