Merge changes I59b6e04f,I55694d89
am: 9009eabbfe

Change-Id: I217e32a7ab25fd73f3361015efae9bbbd1fde0f4