Merge remote-tracking branch 'deymo/master'

BUG: 29768705
Change-Id: I6f69428baee6ca2a4cc2f2b00af0b6e2a808c5b7