Changes for compatibility from API 14+

Change-Id: I269ec7291dc8fb457fc770d3ff4c3c9dc4740225
Signed-off-by: orlando-antonino <orlando.antonino@gmail.com>