5.0.1 and sm

Change-Id: I14f336923cba1a697613ab532d9b220da5c985e9