Change-Id: I45c3a6ce09c300f4485d98e72b4ce2a3b9e09df6
Signed-off-by: Marcelo Portilho <marceloport@gmail.com>
some cleanup

Change-Id: Ib68efb4161a755cc68b57745fd27a7263b67abdb
Signed-off-by: Marcelo Portilho <marceloport@gmail.com>
merged

Change-Id: I7a1ab316de41a0449d23b6b7a85c99d43923b2eb
Signed-off-by: Marcelo Portilho <marceloport@gmail.com>