Merge branch 'master' of oom

Change-Id: I0d7f356a8828a51484307759831e68339a48dcfd