Cumulative patch from commit f89c32e63f71e66d7b55e284016762b603ae02db
am: e466304

* commit 'e4663044d3a689fb5458247e9bc0f8b58cf72fca':
  Cumulative patch from commit f89c32e63f71e66d7b55e284016762b603ae02db

Change-Id: I9a1d6cd640f2feb3232fee6dbf287d4923672e9e