Merge "Fixing content intent on External Storage notification" into oc-dev
am: 5a667c8eb1

Change-Id: I903ee416c140438805289a946d568e20b9c5ca80