init: Pull-in changes from CM12

Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>