Cumulative patch from commit f89c32e63f71e66d7b55e284016762b603ae02db am: e466304
am: ef9ee13

* commit 'ef9ee133864ecab26f9f1bea0fcecef96f0b5191':
  Cumulative patch from commit f89c32e63f71e66d7b55e284016762b603ae02db

Change-Id: I18ffe7e4f96e84958038558635161c75bc5653e4