RN: squash fixes

Signed-off-by: Daiane Angolini <daiane.angolini@freescale.com>