adjusting previous commit to work on AOSP instead of CM

Change-Id: Ia71d30ff05e80c06165f91dab1aceeba06bb27af