am: ec1d075e5f * commit 'ec1d075e5fab3e2d4320c05da6e6bd73d119dcae': Fix NullPointerException
ec1d075e5f