Merge changes If30bfa71,Ib8f78967 into oc-dev am: 1fbefc70df
am: ad1c74c012

Change-Id: Ica0f63301759d1454fe7d665aaa5ae587cd13782